projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2f0a02e
)
wayland: Improve font setting fallback more
author
Matthias Clasen
<mclasen@redhat.com>
Wed, 7 Apr 2021 18:53:00 +0000
(14:53 -0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Wed, 7 Apr 2021 23:24:09 +0000
(19:24 -0400)
We may get a response from the portal that contains
no useful settings at all. In that case, we should
fallback as well.
Fixes: #3838
gdk/wayland/gdkdisplay-wayland.c
patch
|
blob
|
history
diff --git
a/gdk/wayland/gdkdisplay-wayland.c
b/gdk/wayland/gdkdisplay-wayland.c
index c071b4e4c5a7bd0498ecd2f4c4af9fac1a13fe18..ba36d0bb826a053dc9970c17e9a781caae502fc6 100644
(file)
--- a/
gdk/wayland/gdkdisplay-wayland.c
+++ b/
gdk/wayland/gdkdisplay-wayland.c
@@
-1917,6
+1917,14
@@
init_settings (GdkDisplay *display)
g_variant_get (ret, "(a{sa{sv}})", &iter);
+ if (g_variant_n_children (ret) == 0)
+ {
+ g_debug ("Received no portal settings");
+ g_clear_pointer (&ret, g_variant_unref);
+
+ goto fallback;
+ }
+
while (g_variant_iter_loop (iter, "{s@a{sv}}", &schema_str, &val))
{
GVariantIter *iter2 = g_variant_iter_new (val);